Merge from trunk
authorJan D. <jan.h.d@swipnet.se>
Fri, 19 Feb 2010 13:11:21 +0000 (14:11 +0100)
committerJan D. <jan.h.d@swipnet.se>
Fri, 19 Feb 2010 13:11:21 +0000 (14:11 +0100)
commitc2b8bcd162c719b7e9ba2e19c92fdbb95f274355
tree7039704dfc088c28a029a4bd3ea209e8328c4887
parent846b829e321aabf668ef9561eaa175504918e330
parentbc13ad8adf8a80dde7296624fc4f8c6b63e68ff2
Merge from trunk